From 6e65a8f6416bf5dbefc45ed93eabbd811189af58 Mon Sep 17 00:00:00 2001
From: tsteven4 <tsteven4@gmail.com>
Date: Thu, 15 Aug 2013 22:38:22 +0000
Subject: [PATCH] remove insistence that we have expat for kml, gtrnctr,
 ignrando, wfff, osm now that those readers don't use it.

---
 gpsbabel/gtrnctr.cc  | 20 --------------------
 gpsbabel/ignrando.cc | 26 --------------------------
 gpsbabel/kml.cc      | 14 --------------
 gpsbabel/osm.cc      | 22 ----------------------
 gpsbabel/wfff_xml.cc | 19 -------------------
 5 files changed, 101 deletions(-)

diff --git a/gpsbabel/gtrnctr.cc b/gpsbabel/gtrnctr.cc
index 737b15f4a..d6ed2ffdf 100644
--- a/gpsbabel/gtrnctr.cc
+++ b/gpsbabel/gtrnctr.cc
@@ -62,25 +62,6 @@ arglist_t gtc_args[] = {
   ARG_TERMINATOR
 };
 
-#if ! HAVE_LIBEXPAT
-static void
-gtc_rd_init(const char* fname)
-{
-  fatal(MYNAME ": this format does not support reading.\n");
-}
-
-static void
-gtc_read(void)
-{
-}
-
-static void
-gtc_rd_deinit(void)
-{
-
-}
-#else
-
 /* Tracks */
 static xg_callback	gtc_trk_s;
 static xg_callback	gtc_trk_ident;
@@ -197,7 +178,6 @@ gtc_rd_deinit(void)
 {
   xml_deinit();
 }
-#endif
 
 static void
 gtc_wr_init(const char* fname)
diff --git a/gpsbabel/ignrando.cc b/gpsbabel/ignrando.cc
index 0e1b5a6b2..776685a52 100644
--- a/gpsbabel/ignrando.cc
+++ b/gpsbabel/ignrando.cc
@@ -29,10 +29,6 @@
 #include "defs.h"
 #include "xmlgeneric.h"
 
-#if HAVE_LIBEXPAT
-#include <expat.h>
-#endif
-
 #define MYNAME "IGNRando"
 
 static gbfile* fout;
@@ -52,26 +48,6 @@ static arglist_t ignr_args[] = {
   ARG_TERMINATOR
 };
 
-#if ! HAVE_LIBEXPAT
-
-static void
-ignr_rd_init(const char* fname)
-{
-  fatal(MYNAME ": This build excluded \"" MYNAME "\" input support because expat was not installed.\n");
-}
-
-static void
-ignr_read(void)
-{
-}
-
-static void
-ignr_rd_deinit(void)
-{
-}
-
-#else
-
 
 static xg_callback	ignr_start;
 static xg_callback	ignr_nb_etapes, ignr_descr;
@@ -191,8 +167,6 @@ ignr_read(void)
   xml_read();
 }
 
-#endif
-
 /* write support */
 
 /* callbacks registered in ignr_vecs */
diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index 40d6ee0f4..7a39fb915 100644
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -241,19 +241,6 @@ static void kml_step_color(void)
   kml_color_sequencer.seq = kml_color_sequencer.seq + kml_color_sequencer.step;
 }
 
-#if ! HAVE_LIBEXPAT
-static void
-kml_rd_init(const char* fname)
-{
-  fatal(MYNAME ": This build excluded KML support because expat was not installed.\n");
-}
-
-static void
-kml_read(void)
-{
-}
-#else
-
 static xg_callback wpt_s, wpt_e;
 static xg_callback wpt_name, wpt_desc, wpt_coord, wpt_icon, trk_coord, wpt_time;
 
@@ -396,7 +383,6 @@ kml_read(void)
 {
   xml_read();
 }
-#endif
 
 static void
 kml_rd_deinit(void)
diff --git a/gpsbabel/osm.cc b/gpsbabel/osm.cc
index 292f8b2cc..fa27219e7 100644
--- a/gpsbabel/osm.cc
+++ b/gpsbabel/osm.cc
@@ -46,10 +46,8 @@ static gbfile* fout;
 static int node_id;
 static int skip_rte;
 
-#if HAVE_LIBEXPAT
 static route_head* rte;
 static waypoint* wpt;
-static int wpt_loaded, rte_loaded;
 
 static xg_callback	osm_node, osm_node_tag, osm_node_end;
 static xg_callback	osm_way, osm_way_nd, osm_way_tag, osm_way_end;
@@ -65,7 +63,6 @@ xg_tag_mapping osm_map[] = {
   { osm_way_end,	cb_end,		"/osm/way" },
   { NULL,	(xg_cb_type)0,		NULL }
 };
-#endif // HAVE_LIBEXPAT
 
 static const char* osm_features[] = {
   "- dummy -",	/*  0 */
@@ -403,21 +400,6 @@ static osm_icon_mapping_t osm_icon_mappings[] = {
   { -1, NULL, NULL }
 };
 
-#if ! HAVE_LIBEXPAT
-
-void
-osm_rd_init(const char* fname)
-{
-  fatal(MYNAME ": This build excluded \" MYNAME \" support because expat was not installed.\n");
-}
-
-void
-osm_read(void)
-{
-}
-
-#else
-
 
 /*******************************************************************************/
 /*                                   READER                                    */
@@ -670,8 +652,6 @@ osm_rd_init(const char* fname)
 {
   wpt = NULL;
   rte = NULL;
-  wpt_loaded = 0;
-  rte_loaded = 0;
 
   waypoints.clear();
   if (keys.isEmpty()) {
@@ -687,8 +667,6 @@ osm_read(void)
   xml_read();
 }
 
-#endif
-
 static void
 osm_rd_deinit(void)
 {
diff --git a/gpsbabel/wfff_xml.cc b/gpsbabel/wfff_xml.cc
index 52043b12d..333dbdb52 100644
--- a/gpsbabel/wfff_xml.cc
+++ b/gpsbabel/wfff_xml.cc
@@ -56,23 +56,6 @@ arglist_t wfff_xml_args[] = {
 #define MYNAME "wfff_xml"
 #define MY_CBUF 4096
 
-#if ! HAVE_LIBEXPAT
-void
-wfff_xml_rd_init(const char *fname)
-{
-  fatal(MYNAME ": This build excluded WFFF_XML support because expat was not installed.\n");
-}
-void
-wfff_xml_read(void)
-{
-}
-void
-wfff_xml_rd_deinit(void)
-{
-}
-
-#else
-
 static xg_callback	wfff_s,      wfff_e;
 static xg_callback	wfff_wep,    wfff_mac,    wfff_type;
 static xg_callback	wfff_ssid,   wfff_chan;
@@ -310,8 +293,6 @@ wfff_xml_rd_deinit(void)
 
 }
 
-#endif
-
 ff_vecs_t wfff_xml_vecs = {
   ff_type_file,
   {ff_cap_read, ff_cap_none, ff_cap_none},
-- 
2.30.2